From c6ec9f6e897f881a616367f3fbf6c4692dd6b9e1 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 21 Feb 1994 21:50:02 +0000 Subject: [PATCH] (get_keyelt): Cached equiv-key data is now a sublist. --- src/keymap.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/keymap.c b/src/keymap.c index b95c04bc37f..dec406d2303 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -371,14 +371,13 @@ get_keyelt (object) if (XTYPE (object) == Lisp_Cons && XTYPE (XCONS (object)->car) == Lisp_String) object = XCONS (object)->cdr; - /* Also remove the vector that caches key equivalences, if any. */ - if (XTYPE (object) == Lisp_Cons - && XTYPE (XCONS (object)->car) == Lisp_Vector) + /* Also remove the sublist that caches key equivalences, if any. */ + if (CONSP (object) + && CONSP (XCONS (object)->car)) { - object = XCONS (object)->cdr; - /* Also remove the key's description. */ - if (XTYPE (object) == Lisp_Cons - && XTYPE (XCONS (object)->car) == Lisp_String) + Lisp_Object carcar; + carcar = XCONS (XCONS (object)->car)->car; + if (NILP (carcar) || VECTORP (carcar)) object = XCONS (object)->cdr; } } -- 2.30.2